From b9987c3c63c4da0c2f57a0ca2247eb84496a98e3 Mon Sep 17 00:00:00 2001
From: Chad Horohoe <demon@users.mediawiki.org>
Date: Tue, 27 Jan 2009 19:53:20 +0000
Subject: [PATCH] (bug 17180) Go ahead and disable $wgShowIPinHeader if we're
 using $wgUseFileCache.

---
 RELEASE-NOTES      | 2 ++
 includes/Setup.php | 5 +++++
 2 files changed, 7 insertions(+)

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 375c99d588..c01074d3bb 100644
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -67,6 +67,8 @@ it from source control: http://www.mediawiki.org/wiki/Download_from_SVN
 * (bug 3301) Optionally sort user list according to account creation time
 * Remote description pages for foreign file repos are now fetched in the
   content language.
+* (bug 17180) If $wgUseFileCache is enabled, $wgShowIPinHeader is automatically
+  set to false.
 
 === Bug fixes in 1.15 ===
 * (bug 16968) Special:Upload no longer throws useless warnings.
diff --git a/includes/Setup.php b/includes/Setup.php
index 859ad008b8..0cd9bb6144 100644
--- a/includes/Setup.php
+++ b/includes/Setup.php
@@ -197,6 +197,11 @@ if($wgMetaNamespace === FALSE) {
 # To determine the user language, use $wgLang->getCode()
 $wgContLanguageCode = $wgLanguageCode;
 
+# If file caching is enabled, disable $wgShowIPInHeader
+if ( $wgUseFileCache ) {
+	$wgShowIPinHeader = false;
+}
+
 wfProfileOut( $fname.'-misc1' );
 wfProfileIn( $fname.'-memcached' );
 
-- 
2.20.1